Makefile: bump version

mingw/wintesto.cmd: regenerate

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 3d3574c9f7d59a11bdb1e2fde0e9334374084af5..e447049a462af05e8392588358c5227e107f20f7 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -78,8 +78,8 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e '\t./mkstyle.sh > $@ || (rm -f $@ ; exit 1)' ) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_2_1_beta01152004
-VERSIOND=1.2.1_beta01152004
+VERSIONU=1_2_1_beta01312004
+VERSIOND=1.2.1_beta01312004
 #VERSIONU=1_2_1
 #VERSIOND=1.2.1
 

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 2203136ba5f785d50378d10efe63287c102d37e4..2479855210b4a45b3d8286725643a539085d3e5c 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -14,7 +14,9 @@ SET PARAM2=%2
 REM Test if param2 was a dir rather than a file, if so add a \* to make fc work\r
 FOR %%A IN (%2) DO IF "d--------"=="%%~aA" SET PARAM2=%2\*\r
 FOR /f "delims=" %%a IN ('fc %PARAM1% %PARAM2%') DO IF "x%%a"=="xFC: no differences encountered" GOTO :EOF\r
-ECHO %* are not the same - pausing. ^C to quit if required\r
+REM Show the first 5 lines of difference\r
+fc /LB5 %PARAM1% %PARAM2%\r
+ECHO %* are not the same (first 5 differences above) - pausing. ^C to quit if required\r
 PAUSE\r
 GOTO :EOF\r
 \r
@@ -40,30 +42,57 @@ IF NOT EXIST %PNAME% ECHO Can't find %PNAME%&& GOTO :EOF
 \r
 REM Geocaching .loc\r
 DEL %TMPDIR%\gl.loc\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o geo -F %TMPDIR%\gl.loc\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gl.loc reference\r
 \r
 REM GPSUtil\r
-DEL %TMPDIR%\gu.wpt\r
+DEL %TMPDIR%\gu.wpt %TMPDIR%\1.gpx %TMPDIR%\2.gpx\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o gpsutil -F %TMPDIR%\gu.wpt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gu.wpt reference\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i gpsutil -f %TMPDIR%\gu.wpt -o gpx -F %TMPDIR%\1.gpx\r
+%PNAME% -i gpsutil -f reference\gu.wpt -o gpx -F %TMPDIR%\2.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\1.gpx %TMPDIR%\2.gpx\r
 \r
 REM GPSman \r
 DEL %TMPDIR%\gm.gm %TMPDIR%\gm.gm+\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o gpsman -F %TMPDIR%\gm.gm\r
 %PNAME% -i gpsman -f %TMPDIR%\gm.gm -o gpsutil -F %TMPDIR%\gm.gm+\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gm.gm+ %TMPDIR%\gu.wpt\r
 \r
 REM GPX\r
 DEL %TMPDIR%\gl.gpx %TMPDIR%\gpx.gpx\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o gpx -F %TMPDIR%\gl.gpx\r
 %PNAME% -i gpx -f %TMPDIR%\gl.gpx -o gpsutil -F %TMPDIR%\gpx.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gpx.gpx %TMPDIR%\gu.wpt\r
 \r
 REM Magellan Mapsend\r
 DEL %TMPDIR%\mm.mapsend %TMPDIR%\mm.gps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o mapsend -F %TMPDIR%\mm.mapsend\r
 %PNAME% -i mapsend -f %TMPDIR%\mm.mapsend -o gpsutil -F %TMPDIR%\mm.gps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mm.gps %TMPDIR%\gu.wpt\r
 \r
 REM Magellan serial\r
@@ -74,57 +103,101 @@ REM This one is a little tacky, becuase it's a very lossy format.
 REM so we simply test we can write it, and then read it and write it and\r
 REM get an identical file back.\r
 DEL %TMPDIR%\tiger\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o tiger -F %TMPDIR%\tiger\r
 %PNAME% -i tiger -f %TMPDIR%\tiger -o tiger -F %TMPDIR%\tiger2\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\tiger %TMPDIR%\tiger2\r
 \r
 REM CSV (Comma separated value) data.\r
 \r
+@echo on\r
+@echo Testing...\r
 %PNAME%  -i geo -f geocaching.loc -o csv -F %TMPDIR%\csv.csv\r
 %PNAME%  -i csv -f %TMPDIR%\csv.csv -o csv -F %TMPDIR%\csv2.csv\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\csv2.csv %TMPDIR%\csv.csv \r
 \r
 REM\r
 REM Delorme TopoUSA 4 is a CSV strain.  \r
 REM\r
 DEL %TMPDIR%\xmap-1.gpx %TMPDIR%\xmap-2.gpx %TMPDIR%\xmap\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i xmap -f reference\xmap -o xmap -F %TMPDIR%\xmap\r
 %PNAME% -i xmap -f reference\xmap -o gpx -F %TMPDIR%\xmap-1.gpx\r
 %PNAME% -i xmap -f %TMPDIR%\xmap -o gpx -F %TMPDIR%\xmap-2.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\xmap-1.gpx %TMPDIR%\xmap-2.gpx\r
 CALL :COMPARE reference\xmap %TMPDIR%\xmap\r
 \r
 REM PCX (Garmin mapsource import) file format\r
 DEL %TMPDIR%\mm.pcx %TMPDIR%\pcx.gps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o pcx -F %TMPDIR%\mm.pcx\r
 %PNAME% -i pcx -f %TMPDIR%\mm.pcx -o gpsutil -F %TMPDIR%\pcx.gps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mm.gps %TMPDIR%\gu.wpt\r
 \r
 REM Magellan file format\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i magellan -f reference\magfile -o magellan -F %TMPDIR%\magfile\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\magfile reference\magfile\r
 \r
 REM Navitrak DNA marker format\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i dna -f reference\dnatest.txt -o dna -F %TMPDIR%\dnatest.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\dnatest.txt reference\dnatest.txt\r
 \r
 REM PSP (PocketStreets 2002 Pushpin (.PSP)) file format. Use mxf as an \r
 REM intermediate format to avoid binary FP anomalies on compareerent platforms.\r
 DEL %TMPDIR%\psp.mxf %TMPDIR%\mxf.psp\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i psp -f reference\ps.psp -o mxf -F %TMPDIR%\psp.mxf\r
 %PNAME% -i geo -f geocaching.loc -o mxf -F %TMPDIR%\mxf.psp\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\psp.mxf %TMPDIR%\mxf.psp\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i psp -f reference\ps.psp -o gpx -F %TMPDIR%\psp1.gpx\r
+%PNAME% -i psp -f reference\ps.psp -o psp -F %TMPDIR%\xxx.psp\r
+%PNAME% -i psp -f %TMPDIR%\xxx.psp -o gpx -F %TMPDIR%\psp2.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\psp1.gpx %TMPDIR%\psp2.gpx\r
 \r
 REM MXF (Maptech Exchange Format) file format\r
 DEL %TMPDIR%\mx.mxf %TMPDIR%\mxf.mxf\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i mxf -f reference\mxf.mxf -o mxf -F %TMPDIR%\mx.mxf\r
 %PNAME% -i mxf -f %TMPDIR%\mx.mxf -o mxf -F %TMPDIR%\mxf.mxf\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mxf.mxf reference\r
 \r
 REM tmpro (TopoMapPro Places) file format\r
 DEL %TMPDIR%\topomappro.txt %TMPDIR%\mxf.mxf\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i tmpro -f reference\topomappro.txt -o tmpro -F %TMPDIR%\tmp.txt\r
 %PNAME% -i tmpro -f %TMPDIR%\tmp.txt -o tmpro -F %TMPDIR%\topomappro.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\topomappro.txt reference\r
 \r
 REM TPG (NG Topo!) file format\r
@@ -133,15 +206,23 @@ REM inconsistencies in the coordinates.  So..  we test our i/o
 REM against a format that rounds higher than we care to compare\r
 REM for binary data. \r
 DEL %TMPDIR%\topo.mxf %TMPDIR%\tpg.mxf %TMPDIR%\geo.tpg\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o tpg -F %TMPDIR%\geo.tpg\r
 %PNAME% -i tpg -f %TMPDIR%\geo.tpg -o mxf -F %TMPDIR%\tpg.mxf\r
 %PNAME% -i tpg -f reference\tpg.tpg -o mxf -F %TMPDIR%\topo.mxf\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\tpg.mxf %TMPDIR%\topo.mxf\r
 \r
 REM OZI (OziExplorer 1.1) file format\r
 DEL %TMPDIR%\oz.ozi %TMPDIR%\ozi.ozi\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i ozi -f reference\ozi.ozi -o ozi -F %TMPDIR%\oz.ozi\r
 %PNAME% -i ozi -f %TMPDIR%\oz.ozi -o ozi -F %TMPDIR%\ozi.ozi\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\ozi.ozi reference\r
 \r
 REM Holux support is a little funky to test.  Becuase it loses precision,\r
@@ -149,7 +230,11 @@ REM if we convert it to another format, we lose accuracy (rounding) in the
 REM coords, so converting it so something else and comparing it never works.\r
 REM So we verify that we can read the reference and write it and get an\r
 REM identical reference.\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i holux -f reference\paris.wpo -o holux -F %TMPDIR%\paris.wpo\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\paris.wpo %TMPDIR%\paris.wpo\r
 \r
 REM Magellan NAV Companion for PalmOS\r
@@ -163,9 +248,13 @@ REM not verify that the appinfo block was written correctly.  However, it does
 REM successfully test for some endianness errors that might otherwise go \r
 REM unnoticed.\r
 DEL %TMPDIR%\magnav.pdb %TMPDIR%\magnav.gpu %TMPDIR%\magnavt.gpu\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o magnav -F %TMPDIR%\magnav.pdb\r
 %PNAME% -i magnav -f %TMPDIR%\magnav.pdb -o gpsutil -F %TMPDIR%\magnav.gpu\r
 %PNAME% -i magnav -f reference\magnav.pdb -o gpsutil -F %TMPDIR%\magnavt.gpu\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\magnavt.gpu %TMPDIR%\magnav.gpu\r
 CALL :COMPARE reference\gu.wpt %TMPDIR%\magnav.gpu\r
 \r
@@ -173,41 +262,65 @@ REM GPSPilot Tracker for PalmOS
 REM This test is eerily similar to the NAV Companion test.  In fact, the \r
 REM converted reference file (magnavr.gpu) is identical.\r
 DEL %TMPDIR%\gpspilot.pdb %TMPDIR%\gpspilot.gpu %TMPDIR%\gpspil_t.gpu\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o gpspilot -F %TMPDIR%\gpspilot.pdb\r
 %PNAME% -i gpspilot -f %TMPDIR%\gpspilot.pdb -o gpsutil -F %TMPDIR%\gpspilot.gpu\r
 %PNAME% -i gpspilot -f reference\gpspilot.pdb -o gpsutil -F %TMPDIR%\gpspil_t.gpu\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gpspil_t.gpu %TMPDIR%\gpspilot.gpu\r
 CALL :COMPARE reference\gu.wpt %TMPDIR%\gpspilot.gpu\r
 \r
 REM Cetus GPS for PalmOS\r
 REM This test is also similar to the NAV Companion test.\r
 DEL %TMPDIR%\cetus.pdb %TMPDIR%\cetus.gpu %TMPDIR%\cetust.gpu\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o cetus -F %TMPDIR%\cetus.pdb\r
 %PNAME% -i cetus -f %TMPDIR%\cetus.pdb -o gpsutil -F %TMPDIR%\cetus.gpu\r
 %PNAME% -i cetus -f reference\cetus.pdb -o gpsutil -F %TMPDIR%\cetust.gpu\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\cetust.gpu %TMPDIR%\cetus.gpu\r
 CALL :COMPARE reference\cetus.gpu %TMPDIR%\cetus.gpu\r
 \r
 REM QuoVadis GPS for PalmOS\r
 REM This test is derived from the Cetus test above.\r
 DEL %TMPDIR%\quovadis.pdb %TMPDIR%\quovadis.gpu %TMPDIR%\quovadist.gpu\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o quovadis -F %TMPDIR%\quovadis.pdb\r
 %PNAME% -i quovadis -f %TMPDIR%\quovadis.pdb -o gpsutil -F %TMPDIR%\quovadis.gpu\r
 %PNAME% -i quovadis -f reference\quovadis.pdb -o gpsutil -F %TMPDIR%\quovadist.gpu\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\quovadist.gpu %TMPDIR%\quovadis.gpu\r
 CALL :COMPARE reference\quovadis.gpu %TMPDIR%\quovadis.gpu\r
 \r
 REM GpsDrive\r
 DEL %TMPDIR%\gpsdrive.txt\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o gpsdrive -F %TMPDIR%\gpsdrive.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gpsdrive.txt reference\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i gpsdrive -f reference\gpsdrive.txt -o gpsdrive -F %TMPDIR%\gpsdrive2.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gpsdrive2.txt reference\gpsdrive.txt\r
 \r
 REM XMapHH Street Atlas USA file format\r
 DEL %TMPDIR%\xmapwpt.wpt %TMPDIR%\xmapwpt.xmapwpt\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i xmapwpt -f reference\xmapwpt.wpt -o xmapwpt -F %TMPDIR%\xmapwpt.xmapwpt\r
 %PNAME% -i xmapwpt -f %TMPDIR%\xmapwpt.xmapwpt -o xmapwpt -F %TMPDIR%\xmapwpt.wpt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\xmapwpt.wpt reference\r
 \r
 REM XCSV\r
@@ -222,8 +335,12 @@ ECHO IFIELD SHORTNAME,,%%s>> %TMPDIR%\testo.style
 ECHO IFIELD LAT_DIRDECIMAL,,%%c%%lf>> %TMPDIR%\testo.style\r
 ECHO IFIELD LON_DECIMALDIR,,%%lf%%c>> %TMPDIR%\testo.style\r
 DEL %TMPDIR%\xcsv.geo %TMPDIR%\xcsv.xcsv\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o xcsv,style=%TMPDIR%\testo.style -F %TMPDIR%\xcsv.geo\r
 %PNAME% -i xcsv,style=%TMPDIR%\testo.style -f %TMPDIR%\xcsv.geo -o xcsv,style=%TMPDIR%\testo.style -F %TMPDIR%\xcsv.xcsv\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\xcsv.geo %TMPDIR%\xcsv.xcsv\r
 \r
 REM Garmin Mapsource This is a binary format with some undocumented\r
@@ -233,32 +350,52 @@ REM write it as GPX and compare them.  Since we're writing both GPX files
 REM ourselves from the same version, we're immune to changes in our own\r
 REM GPX output.\r
 \r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i mapsource -f reference\mapsource.mps  -o gpx -F %TMPDIR%\ms1.gpx\r
 %PNAME% -i mapsource -f reference\mapsource.mps  -o mapsource -F %TMPDIR%\ms.mps\r
 %PNAME% -i mapsource -f %TMPDIR%\ms.mps -o gpx -F %TMPDIR%\ms2.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\ms1.gpx %TMPDIR%\ms2.gpx\r
 \r
 REM\r
 REM MRCB mapsource track test\r
 REM\r
 DEL %TMPDIR%\mps-track.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -t -i mapsource -f reference\track\mps-track.mps -o mapsource -F %TMPDIR%\mps-track.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mps-track.mps reference\track\r
 REM Now do a test of reading waypoints from a track-only file - should have an empty result\r
 DEL %TMPDIR%\mps-track.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i mapsource -f reference\track\mps-track.mps -o mapsource -F %TMPDIR%\mps-track.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mps-track.mps reference\mps-empty.mps\r
 \r
 REM\r
 REM MRCB mapsource route test\r
 REM\r
 DEL %TMPDIR%\mps-route.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i mapsource -f reference\route\route.mps -o mapsource,mpsverout=4 -F %TMPDIR%\mps-route.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mps-route.mps reference\route\route.mps\r
 \r
 REM Now do a test of reading tracks from a route-only file - should have an empty result\r
 DEL %TMPDIR%\mps-route.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -t -i mapsource -f reference\route\route.mps -o mapsource -F %TMPDIR%\mps-route.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mps-route.mps reference\mps-empty.mps\r
 \r
 REM\r
@@ -268,8 +405,12 @@ REM read the reference file, spin it to GPX and back to GCDB and then spin
 REM that one to GPX.\r
 REM\r
 \r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i gcdb -f reference\GeocachingDB.PDB -o gpx -F %TMPDIR%\gcdb1.gpx -o gcdb -F %TMPDIR%\gcdb1.pdb\r
 %PNAME% -i gpx -f %TMPDIR%\gcdb1.gpx -o gpx -F %TMPDIR%\gcdb2.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\gcdb1.gpx %TMPDIR%\gcdb1.gpx\r
 \r
 REM\r
@@ -277,8 +418,12 @@ REM Duplicate filter - Since filters have no format of their own, we use csv
 REM as an intermediate format for testing the filter.\r
 REM\r
 DEL %TMPDIR%\filterdupe.csv1 %TMPDIR%\filterdupe.csv2\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o csv -F %TMPDIR%\filterdupe.csv1\r
 %PNAME% -i geo -f geocaching.loc -f geocaching.loc -x duplicate,shortname -o csv -F %TMPDIR%\filterdupe.csv2\r
+@echo off\r
+@echo.\r
 CALL :SORTandCOMPARE %TMPDIR%\filterdupe.csv1 %TMPDIR%\filterdupe.csv2\r
 \r
 REM\r
@@ -286,21 +431,33 @@ REM Position filter -  Since very small distances are essentialy a duplicate
 REM position filter, we can test very similarly to the duplicate filter.\r
 REM\r
 DEL %TMPDIR%\filterpos.csv1 %TMPDIR%\filterpos.csv2\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o csv -F %TMPDIR%\filterpos.csv1\r
 %PNAME% -i geo -f geocaching.loc -f geocaching.loc -x position,distance=5f -o csv -F %TMPDIR%\filterpos.csv2\r
+@echo off\r
+@echo.\r
 CALL :SORTandCOMPARE %TMPDIR%\filterpos.csv1 %TMPDIR%\filterpos.csv2\r
 \r
 REM\r
 REM Radius filter\r
 REM\r
 DEL %TMPDIR%\radius.csv\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -x radius,lat=35.9720,lon=-87.1347,distance=14.7 -o csv -F %TMPDIR%\radius.csv\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\radius.csv reference\r
 REM\r
 REM magellan SD card waypoint / route format\r
 REM\r
 DEL %TMPDIR%\magellan.rte\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i magellan -f reference\route\magellan.rte -o magellan -F %TMPDIR%\magellan.rte\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\magellan.rte reference\route\magellan.rte\r
 \r
 REM\r
@@ -308,8 +465,12 @@ REM GPX routes -- since GPX contains a date stamp, tests will always
 REM fail, so we use magellan as an interim format...\r
 REM\r
 DEL %TMPDIR%\gpxroute.gpx %TMPDIR%\maggpx.rte\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i gpx -f reference\route\route.gpx -o gpx -F %TMPDIR%\gpxroute.gpx\r
 %PNAME% -r -i gpx -f %TMPDIR%\gpxroute.gpx -o magellan -F %TMPDIR%\maggpx.rte\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\maggpx.rte reference\route\magellan.rte\r
 \r
 REM\r
@@ -317,38 +478,58 @@ REM GPX tracks -- since GPX contains a date stamp, tests will always
 REM fail, so we use magellan as an interim format...\r
 REM\r
 DEL %TMPDIR%\gpxtrack.gpx %TMPDIR%\maggpx.trk\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -t -i gpx -f reference\track\tracks.gpx -o gpx -F %TMPDIR%\gpxtrack.gpx\r
 %PNAME% -t -i magellan -f reference\track\meridian.trk -o gpx -F %TMPDIR%\maggpx.trk\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\maggpx.trk %TMPDIR%\gpxtrack.gpx\r
 \r
 REM\r
 REM MAPSEND waypoint / route format\r
 REM\r
 DEL %TMPDIR%\route.mapsend\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i mapsend -f reference\route\route.mapsend -o mapsend -F %TMPDIR%\route.mapsend\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\route.mapsend reference\route\r
 REM\r
 REM MAPSEND track format \r
 REM\r
 DEL %TMPDIR%\mapsend.trk\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -t -i mapsend -f reference\track\mapsend.trk -o mapsend -F %TMPDIR%\mapsend.trk\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\mapsend.trk reference\track\r
 REM\r
 REM copilot\r
 REM\r
 DEL %TMPDIR%\copilot.pdb\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i copilot -f reference\UKultralight.pdb -o copilot -F %TMPDIR%\cop.pdb\r
 %PNAME% -i copilot -f reference\UKultralight.pdb -o gpx -F %TMPDIR%\cop1.gpx\r
 %PNAME% -i copilot -f %TMPDIR%\cop.pdb -o gpx -F %TMPDIR%\cop2.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\cop1.gpx %TMPDIR%\cop2.gpx\r
 \r
 REM\r
 REM EasyGPS.   Another binary format.\r
 REM\r
 DEL %TMPDIR%\easy.loc\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i easygps -f reference\easygps.loc -o easygps -F %TMPDIR%\ez.loc\r
 %PNAME% -i easygps -f reference\easygps.loc -o gpx -F %TMPDIR%\ez1.gpx\r
 %PNAME% -i easygps -f %TMPDIR%\ez.loc -o gpx -F %TMPDIR%\ez2.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\ez1.gpx %TMPDIR%\ez2.gpx\r
 \r
 REM\r
@@ -356,15 +537,23 @@ REM GPilotS.   A Palm format.  Another binary format that
 REM\r
 REM rm -f ${TMPDIR/gpilots.l\r
 REM${PNAME} -i easygps -f reference/gpilots.pdb -o gpx -F ${TMPDIR}/gp.gpx\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i geo -f geocaching.loc -o gpilots -F %TMPDIR%\blah.pdb\r
 %PNAME% -i gpilots -f %TMPDIR%\blah.pdb -o gpx -F %TMPDIR%\1.gpx\r
 %PNAME% -i gpilots -f reference\gpilots.pdb -o gpx -F %TMPDIR%\2.gpx\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\1.gpx %TMPDIR%\2.gpx\r
 REM${PNAME} -i easygps -f reference/gpilots.pdb -o gpx -F ${TMPDIR}/gp.gpx\r
 \r
 REM\r
 REM Navicache.\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i navicache -f reference\navicache.xml -o gpsutil -F %TMPDIR%\navi.wpt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\navi.wpt reference\navicache.ref\r
 REM\r
 \r
@@ -372,59 +561,95 @@ REM PsiTrex.  A text format that can't be handled by XCSV due to context of
 REM data based on other data values in the file\r
 REM Waypoints first\r
 DEL %TMPDIR%\psit-ww.txt %TMPDIR%\psit-ww.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i psitrex -f reference\psitwpts.txt -o mapsource -F %TMPDIR%\psit-ww.mps\r
 %PNAME% -i mapsource -f %TMPDIR%\psit-ww.mps -o psitrex -F %TMPDIR%\psit-ww.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\psitwpts.txt %TMPDIR%\psit-ww.txt\r
 \r
 REM Now test correct "empty" handling - ask for routes when there aren't any\r
 REM Uses mapsource as the empty handling for this has already happened above\r
 DEL %TMPDIR%\psit-wr.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i psitrex -f reference\psitwpts.txt -o mapsource -F %TMPDIR%\psit-wr.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-wr.mps\r
 \r
 REM Routes next\r
 DEL %TMPDIR%\psit-rr.txt %TMPDIR%\psit-rr.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i psitrex -f reference\route\psitrtes.txt -o mapsource -F %TMPDIR%\psit-rr.mps\r
 %PNAME% -r -i mapsource -f %TMPDIR%\psit-rr.mps -o psitrex -F %TMPDIR%\psit-rr.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\route\psitrtes.txt %TMPDIR%\psit-rr.txt\r
 \r
 REM Now test correct "empty" handling - ask for tracks when there aren't any\r
 REM Uses mapsource as the empty handling for this has already happened above\r
 DEL %TMPDIR%\psit-rt.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -t -i psitrex -f reference\route\psitrtes.txt -o mapsource -F %TMPDIR%\psit-rt.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-rt.mps\r
 \r
 REM Tracks last\r
 DEL %TMPDIR%\psit-tt.txt %TMPDIR%\psit-tt.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -t -i psitrex -f reference\track\psittrks.txt -o mapsource -F %TMPDIR%\psit-tt.mps\r
 %PNAME% -t -i mapsource -f %TMPDIR%\psit-tt.mps -o psitrex -F %TMPDIR%\psit-tt.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\track\psittrks.txt %TMPDIR%\psit-tt.txt\r
 \r
 REM Now test correct "empty" handling - ask for waypoints when there aren't any\r
 REM Uses mapsource as the empty handling for this has already happened above\r
 DEL %TMPDIR%\psit-tw.mps\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i psitrex -f reference\track\psittrks.txt -o mapsource -F %TMPDIR%\psit-tw.mps\r
+@echo off\r
+@echo.\r
 CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-tw.mps\r
 \r
 REM\r
 REM Arc Distance filter\r
 REM\r
 DEL %TMPDIR%\arcdist.txt\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i xmap -f reference\arcdist_input.txt -x arc,file=reference\arcdist_arc.txt,distance=1 -o xmap -F %TMPDIR%\arcdist.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\arcdist.txt reference\arcdist_output.txt\r
 \r
 REM\r
 REM Polygon filter\r
 REM\r
 DEL %TMPDIR%\polygon.txt\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -i xmap -f reference\arcdist_input.txt -x polygon,file=reference\polygon_allencty.txt -o xmap -F %TMPDIR%\polygon.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\polygon.txt reference\polygon_output.txt\r
 \r
 REM\r
 REM Simplify filter\r
 REM\r
 DEL %TMPDIR%\simplify.txt\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i gpx -f reference\route\route.gpx -x simplify,count=10 -o arc -F %TMPDIR%\simplify.txt\r
+@echo off\r
+@echo.\r
 CALL :COMPARE %TMPDIR%\simplify.txt reference\simplify_output.txt\r
 \r
 REM\r
@@ -432,10 +657,50 @@ REM Route reversal filter.   Do it twice and be sure we get what we
 REM started with.\r
 REM\r
 DEL %TMPDIR%\reverse1.arc %TMPDIR%\reverse2.arc %TMPDIR%\reference.arc\r
+@echo on\r
+@echo Testing...\r
 %PNAME% -r -i gpx -f reference\route\route.gpx -o arc -F %TMPDIR%\reference.arc\r
 %PNAME% -r -i gpx -f reference\route\route.gpx -x reverse -o arc -F %TMPDIR%\reverse1.arc\r
 %PNAME% -r -i gpx -f reference\route\route.gpx -x reverse -x reverse -o arc -F %TMPDIR%\reverse2.arc\r
+@echo off\r
+@echo.\r
 REM Verify the first and last are the same\r
 CALL :COMPARE %TMPDIR%\reference.arc  %TMPDIR%\reverse2.arc\r
 REM Verify the first and second are different.\r
 \r
+REM\r
+REM Geoniche: No reference file was available, so we created one and just\r
+REM test it against itself.\r
+REM\r
+DEL %TMPDIR%\gn.pdb %TMPDIR%\1.gpx %TMPDIR%\2.gpx\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i geoniche -f reference\geoniche.pdb -o geoniche -F %TMPDIR%\gn.pdb\r
+%PNAME% -i geoniche -f reference\geoniche.pdb -o gpx -F %TMPDIR%\1.gpx\r
+%PNAME% -i geoniche -f %TMPDIR%\gn.pdb -o gpx -F %TMPDIR%\2.gpx\r
+@echo off\r
+@echo.\r
+\r
+REM\r
+REM saroute covers *.anr, *.rte, and *.rtd, but I only have an .anr for testing.\r
+REM Unfortunately for us, this is a read-only format for now.\r
+REM\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -t -i saroute -f reference\track\i65.anr -o gpx -F %TMPDIR%\gpl1.gpx\r
+%PNAME% -t -i gpx -f reference\track\i65.anr.gpx -o gpx -F %TMPDIR%\gpl2.gpx\r
+@echo off\r
+@echo.\r
+\r
+REM\r
+REM Delorme GPL file.   This is sort of a track format.\r
+REM\r
+DEL %TMPDIR%\gpl1.gpx %TMPDIR%\gpl2.gpx %TMPDIR%\gpl1.gpl\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -t -i gpl -f reference\track\webpark1.gpl -o gpx -F %TMPDIR%\gpl1.gpx\r
+%PNAME% -t -i gpl -f reference\track\webpark1.gpl -o gpl -F %TMPDIR%\gpl1.gpl\r
+%PNAME% -t -i gpl -f %TMPDIR%\gpl1.gpl -o gpx -F %TMPDIR%\gpl2.gpx\r
+@echo off\r
+@echo.\r
+\r